Little refractoring