Address docstring and wrapping comments