More formatting and indenting