General cleanup

After this I'll work on the npm package for this. :water_buffalo: