Moved docstring

also includes a few other cleanup items