indenting and style updates