indenting cleanup