made router internals a little more consistent