Bit more cleanup (happy now, codeclimate?)