More refactoring stuff
Merge branch 'master' of https://github.com/herp-a-derp/Corruption-of-Champions
Fixes issue https://github.com/herp-a-derp/Corruption-of-Champions/issues/14
Merge branch 'master' of https://github.com/herp-a-derp/Corruption-of-Champions