Some refactoring of the game layout