Unify style for comments
Unify whitespace usage

It looks like you're using two blank lines to separate major sections of
code.