fix bugs
Refactored 01 task