Dino catalog

Please look at this request
Redundant `return` detected.