Namespacing and cleanup