cleaning up var names