Cleanups from Code Climate.