Rubocop refactorings