Merge pull request #10 from mariusoe/master

Refactored some code to match checkstyle
Refactored code to match checkstyle