Refactor matching success in progress