improve naming, make sync implicit