cleaned up namespaces etc