cleaning up namespace and class names