Clean up formatting and whitespace