Remove the footnotes and use the name

also extract out the span tag into a helper