Clean up whitespace and indentation