Data transform refinements (area)
Label cleanup
Housekeeping