Tidy up HTML, style