Simplify state machine usage