cleaned up main data resolve and data service