Some refactoring and clean up
Merge branch 'master' of https://github.com/zbialecki/SpotHype