DinoDex refactor

Refactored DinoDex based on comments from first pull request.
You have a lot of these empty first lines, I think our de facto standard is to not have an empty line at the top (but do have a newline at the end of the file)