More cleanup for better html validation