3413: code review update