Reformat vars in consumer