refactored games