Fix multiple code style warnings
Merge pull request #16 from wmde/betterCode

Fix multiple code style warnings