Code cleanup
Support for span labels