Moved list of dogs out to its own module
Some small tweaks