Quick refactor of yatzy