Re-indent code. Many changes are whitespace only.