[WIP] CC Refactors

Targets a few particularly low scoring classes in Code Climate