Update edits according to PR feedback