little refactor for namespace related