Use indentation to clarify structure

Change-Id: Iae9021f056c5c704993f5dc6b036df581c0dc660
Merge "Use indentation to clarify structure"