refactor: type namespace cleanup