cosmetic code changes in issue 1977