move comments into todos