CodeClimate was hurting my pride, so I made a quick fix
Merge branch 'cc_refactor'