Improve cleanUpHTML