Clean up & Namespaces fix