small refactorings
Can create new tasks