More docstring updates and cleaning up variable over writes.