Rubocop + refactor