Refactoring.
Task is now runned only once #baelfire-20 done