Minor routing adjustments
Spaces removed