Add synchronization points

code factorization

remove useless comments
4 files changed