Indenting cleanups