Cleanup variable visibility