refactor($state): disentangling retry logic
 - Dropping unnecessary variable assignments
 - Misc. cleanup