Game headers refactoring