DinoDex refactor

Refactored DinoDex based on comments from first pull request.
@jmmastey can we change hound on this? Don't we want this to be aligned?