Cleanup and formatting
Merge pull request #1 from kacprzak/master

Cleanup and formatting