Don't add visual noise in new code.

Change-Id: I3e8370fdfed58afe0c253410465219cce3065808
Use sane indentation in new files.

Change-Id: Ida89284c00946d3972c4e45a5453ccfdff99713f