Code review edits