Improve some docstrings, removes sphinx warnings.
Improve some more doctstrings
Remove unused imports