refactored namespace