fix instuctor
refactoring