Reformatted to make doctests work