Cleanups in main
Merge pull request #128 from minotar/clean-main

Cleanups in main