some rubocop refactors