Fix comments from Rothkrantz