Clean up Game model (a bit)