bit of cleanup, started prepping for nested Dice