Code cleanup
Merge pull request #11 from kaiska/feat-code-cleanup

Code cleanup