DRY up routing file

Cleander routing file #812