re-indenting some things