Cleaning up the code by removing a giant match tree and other small improvements that were mentioned in #13
Clarified a few comments that were poorly written
Merge pull request #16 from jroweboy/modular_routing

Cleaning up the code by removing a giant match tree and other small things