clean up var names