refactoring of TODOs