Cleanup.
Minor tunning to UPnPService.