refactoring googlesync