Moved docstring comments back to within methods, per spec.