More Rubocop Polishing