Removed unneeded span tags