Mostly indenting and style changes