Formatting and clean-up
Merge pull request #6 from hugovk/patch-1

Formatting and clean-up