Remove useless loop
Remove useless argument as well
Test more fight styles