Improving router example