code review update