Cleanup the code so it conforms to the Caplin code style
Merge pull request #14 from janhancic/misc/clean-code

Cleanup the code so it conforms to the Caplin code style