Minor clean up on Namespaces