Fixed for-in-loops coding style