some reworking

(nothing specific)