several style changes suggested by Ben Mahler

review: https://reviews.apache.org/r/15161