CLSN-1267 : code review fixes for sonu