Clean up comments and docstrings

None of the changes in this commit have a functional impact.