Simplification.

Simplification du code.

et pull-request.