more refactoring
added teacher
more refactorings