CLeaned up routing.