Refactor tournament feature