Some html clean up