Clean up the markup