Tournaments refactoring