Refactored code to fit checkstyle
Merge pull request #15 from mariusoe/master

Refactored code to fit checkstyle