undid todo refactoring