Docstring and other code review fixes