Cleanup variable use