Var renamings, another pass.
Reformatted code.