Cleaned up namespaces.