Fix/clean HTML markup