Clean up identation and tags