Edits from PR review