PR review: clean up according to Glenn's 2nd round of review