refactor teacher list