Fixed a routing typo and cleaned up a bit