First comment refactor (improved dices)