Clean up route matching
Change exports style