additional changes for pull request review suggestions