I moved config stuff to an external yaml file, and did some other cleanup

If you don't agree w/ my style, that's cool too; just thought I'd let you know about what I did.