cleaned up namespaces and references