clean up for loop code