Simplify loop vars