Clean up comments and docstrings

None of the changes in this commit have a functional impact.
Merge pull request #1211 from Ichimonji10/cleanup

Clean up comments and docstrings