Clean up var statements