Improved code layout in game.c