Refactor GameSpec
Refactor TeamSpec