Fixing some CodeClimate problems