Minor changes.

Changed names of states and removed some commented code.