OFC-279 Perform code review and refactor DataService

work in progress