Enhance my for loop