remove 2 set but unused variables
p2 -i: minor improvs