Formatting and indentation fixes

What is this, LISP? Indent and newline properly, you animal!