Tidying up routes and alerts