Improvement: Start to tidy HTML, as requested by Predrag.