CFY-1511 code revirew comments