simplify die logic a bit