Did some cleanup in TournamentPredictor