Refactor, clean up
Merge branch 'master' of https://github.com/GollyTicker/WS1314