Revert "Revert "Indenting""

This reverts commit 88acf21074030e1c106dc1eb067936cdc3a74530.