refactored methods order in Match class