let the refactorings commence
reshuffle
fix stuff
Merge pull request #4 from IanRandall/refactor

Refactor