Less CodeClimate complaining