Cleaning up HTML markup