Improve Dice command

Make the command more compliant with DRY and PS style.