Cleaned up NAMESPACE