Readability and old for loop removal