Code cleanup
Code cleanup
Code cleanup
Changed initial state