Finished refactoring MatchView