[FIX] Replace ugly fors with elegant underscore notation