Use enhanced for loops

for #9