Refacto messages

Cf. #417