OFC-279 - Perform code review and refactor DataService