and more indenting fixes