refactor out todo helper methods