Reformat code to conform with java conventions
Merge pull request #8 from sonOfRa/reformat

Reformat code to conform with java conventions