Cosmetic changes as per recent pull request feedback comments