Game Screen refactor