Refactored win conditions