Some rubocop offenses fixed