General cleanup
Merge pull request #16 from kraftmatic/feature/cleanup

General cleanup