Simplify Synchronization

Synchronization is growing larger and does repeated actions when a little bit of reshuffling could make it simpler and faster.