clean up namespacing