Code style, remove debug output
Support returning of canonical ns names