Comment and whitespace fixes

Also fix a tiny code typo