Add DiceGameDecomposed, code cleanup