Refactor championship