Clean up indentation and insert line breaks