Tidy up divs and comments