minor refactoring for Tag-Factory