a little code clean up, created Sync service