Refactoring
Doctest runner