Transitioned more components to use global variables.