Cleaned up global variables