fix a couple typos and a little cleanup
Authored by: sms00 2018-02-23
Parent: [r3423]
Child: [r3425]