These are great points!
I'll re-order those lines, and make the variable name for the current modelView matrix more clear.