Cleanup, tidy routing and logging