* Cleaned up namespace