Tighten up changes for pull request