Refactorings, beginning of sync