Minor code tweak; stop assigning unused variables.