cleaned up var declarations