CFY-606 some docstring cleanup