Refactored router helper.