Big HTML markup clean-up