Cleaning up the HTML a bit