Partly refactor task 01