Chop duplicate html block, minor reformat