Package and docstring cleanup