don't dup on peek_line; cleanup comments