Fixes, refactoring the code
Fucking tabs
Merge pull request #1 from jim-rastlerton/master

Muh