refactor
refactor
fix a bit
accept to become pupil by master