Clean up the formatting