Re-indent and whitespace cleanup