More html cleanup