Edits to address review notes