More RuboCop refactorigns