Some code-refactoring
Done Champion registration, close #1