Some rubocop offenses fixed.