Fix in keyword cleanup