Cleanup source
Merge pull request #16 from knownasilya/cleanup

Cleanup source