Code cleanup
Added game states