More clean up to the Catalog class. Converted {} to dict() where possible.