s: simplifications in router