changes from PR feedback