Clean up and format