Refactored dino_catalog after code review