More clean-up, defined GlobalConstants