CFY-606 some formatting