Re-indent and whitespace fixes