Another little refactor

This is all code climate's fault.