Updated namespacing and cleanup