Clean up of the formatting.