CGE2: Reduce the scope of a couple of variables, fix style