docstring fixes
multiple refactorings