CFY-1308 code review modifications