refactor task2 from home