Remove unnecessary CSS class by replacing spans with divs