Address comments from https://codereview.chromium.org/234083003/#ps160001, and formatting cleanup