Cleanup Intl middleware and routes

This does some cleanup to simplify the `intl` middleware and also cleans up the route handlers.