Replaced all for-var-in with for