Clean up format