gazetter refactoring