Refactored globals