cleaned up namespaces