refactor todo and project comments