Bringing the if...else condition in the for loop