Addressed pull request feedback