src: refractoring