Refactor based on what Rubocop found offensive