edit docstrings and codestyle
Merge pull request #1 from smichr/3563

edit docstrings and codestyle