refactored todos to conform to new standards