Factorized duplicated code

2018-02-14, Edouard Tisserant