improve docs and naming