Added random hero choose && code clean