clean up var order