cleaned up namespace and description