Clean up for sum/get_next_rolls .. needs more simplification