fix refactor teaching