Further refactoring of dino_fetcher

Trying to clean up the use of excessive if statements and remove
unnecessary code.