Next round of indenting fixes