CFY-1000 some code cleanup and documentation changes