Refactor matches #11

Closed vncz14 closed 1 month ago