Moved and changed match confirmation and added to tourn pair model

Redundant `return` detected.