Clean states and transitions up a bit