Refactoring + Synchronizing code