Fix indendation, formatting and inter-method vertical whitespace.