CodeClimate fixes 2