make router preflight code more readable

I stumbled over the preflight code today. If you think mine is more understandable merge it. If not that's fine, too.