Tidy routing and config.