Made all the global things not global