Hard agree here. There are so many small things there that could be improved.

One simple one is identifier re-use, if it is necessary for some reason, then at the very least it shouldn't happen within a specific time frame, so that you may have the same identifier used again as in the scenario.