233 315 324 Improvements to Route Token Formatter

I brought 325 changes with the PR comments as well.