refactor namespace things