Refactors minor bits
Merge branch 'master' of https://github.com/nickick/w2d2