Enhance for loop a bit more