Performance improve.
Threashold increased.
Code clean up.