Cleaning up dirty markup