Clean up of the markup.