Remove unnecessary code from oneAwayFromWin
Change player/computer to X/O
Consolidate matching functions