Refactoring + Task list update