More rubocop changes