Refactor task

#3