Improvements of the code.

No match.