A few small adjustments to support cleaning and reindexing labels using abstraction