clean up from PR #644 code review