Removed unessecary error checking
Reordered match views