Minor yadi.catalogs refactoring
Merge pull request #34 from rmk135/yadi-catalogs-refactoring

Minor yadi.catalogs refactoring