Code review edits - 433