tidied up the dice class