DinoDex refactor

Refactored DinoDex based on comments from first pull request.
Redundant `return` detected.