Changed game type to StateBasedGame, readability improvements