Refactor sync section