More small refactors
Merge branch 'master' of github.com:Drayshak/EnderTech