More rubucop changes