Fixup mixed leading whitespace

Minor comment and casing fixes.  Remove unnecessary global.

Change-Id: Iaf5ab35f0c0513a906531cda29bdadf71b4574b9