Cleaning up routes to use match