cleaning and update namespacing