Removed unnecessary span tags