Docstrings and cruft removal