"[skip ci]CodeClimate was hurting my pride, so I made a quick fix"
Merge branch 'more_cc_cleanup'