refactor to easier value/state helpers
refactor to easier value/state helpers
sync refactor