Make router more D.R.Y.