1) code readability improvements
2) performance improvement: wait random period on update conflict before
another try