clean up namespacing code