Routing tidy up
Code readability