Reduce indentation levels.

Change-Id: I5de3dea88a1e6f36c995697ba648ce6b82f4e8ae