Time synchronization refactoring