Small refactor to make sync-engine-client more modullar