Cleaning up var names