namespace refactored