Clean up var naming