Rubocop improvements for the new concerns