Better variable naming, and small optimization.

2018-02-14, Edouard Tisserant