More refactoring and tournament size adjustment