Moved variables out of the global namespece