Cleaning up namespaces in the example