service-url -> api-url and minor cleanup