small refactor and tidy of dice spec