Nicer HTML structure