refactor donw

pass sample test