Some indenting cleanup