(minor) formatting/cleanup

Change-Id: Ic22b7a83f5e5709bd655fba4dcd3dac120c58801