Refactor w/rubocop