Change synchronization
Comments and refactoring