refactoring todos