Minor routing updates
Code refactored