Refactor Game serialization