fixup! pull request feedback and minor cleanup