Cleaned up namespaces