Made changes in response to PR feedback