Make state machine more readable