Even more Rubocop changes