Refactoring of game client