applying more changes to reduce rubocop complaints