yacht dice refactor