Tidied up namespaces