Rework label variables