Refactoring GameHandler