minor refactoring in importing catalog