More Rubocop changes!