Refactored game classes