Clean up var declarations