clean up var definitions