SaxGameStateHandler code improved