Fixed some indenting and style