Refactoring following running RuboCop in -lint mode.