some simplifications in TODO according to the book