- cleaned up namespace tag parsing