Refactored Game