Minor yadi.catalogs refactoring