cleanup from review of diff since last release. All whitespace or
removing logging except for one check for null.
Authored by: Eric House 2016-01-27
Parent: [813d5c]
Child: [8327fa]