Code Climate clean-up