slight cleanup

Change-Id: Id4cdf7e6a8ab27580ca52ac819d3d36a985e4217