REV: Cleaned up data service.