src: small refractoring