Tiny cleanup changes to router