Cleaned GameLayer and PlayerModel