refact code and fix in 01,02,03
refact code and fix in 01,02,03