More Rubocop passing