Fixed unnecessary spans