Tidied up namespacing