refactoring/todos