Cleaned code
Merge pull request #13 from Wisheri/code-clean

Formatting improvements