Clean up Game a bit