refactored champion and added some specs