Refactored code to match checkstyle
Merge pull request #11 from mariusoe/master

Refactored code to match checkstyle