More RuboCop refactorings