Refactored game modes