Cleaned up a route and lister