made match report logic more readable