more refactoring to rubocop requirements