Slight changes to Routing for readability / consistency