Clean code related to collection sync