Pleasing rubocop, refactoring for lower complexity