JS Namespacing fixed