Doctest cleanup