Docstring cleanups and other review comments from @lvh