CFY-1025 some comments and cleanup: