Correct indentation and generally tidy up whitespace.