Cosmetic changes
Integrated the state transitions.