Reformat the source code to make the formatting more consistent and prettier.
Merge pull request #3 from kasperl/beautify

Reformat the source code to make the formatting more consistent