reformat output & modify span class