Tasks - Refactoring Tasks before insert more