A bit of refractoring