Tournament refactor