Clean up var name
Update deps