Refactor sync status