DinoDex refactor

Refactored DinoDex based on comments from first pull request.
In our codebases (and from the styleguides we most closely follow) we do want them indented further. I also find this more readable. Do you not?