Refactored game type code.