more variable cleanup, ensuring labels are used consistently