tweaking syncer
Refactoring