Appease CodeClimate round II