Standardize spacing

Change-Id: I1f8d83497fb1e50220993bfc267f05d93250d57c