dataservice: refactor accountDS done