DRY up routing file

Cleaned routing file #812