Basic style fixes
Merge pull request #1 from q3k/master

Basic style fixes