Code review update