cleanup
vocabulary: terms: adjust data props
better helpers