Refactoring To-Do list with more Objects