Refactor, added ToDoItemSorter class