Made span tags more readable