CodeClimate fixes, to be continued.