Moving Span to class