Cleanups from CodeClimate.