Refactored Match class -- not really refactored, only updated its lay out