Tasks List refactoring