update format per discussion on https://codereview.chromium.org/23431018/