Cleanup of docstrings, line breaks etc
Bugfix. Only dispose if not disposed