Restructured loop, variable names