Refactored game time