better function names and reduce locations of roll tally presumptions