Refactor drawing Xs and Os