Code review updates
Minor history change