removed unused import and slight structure cleanup
Moved import statement so tests can find the correct global variable