A little bit of refractoring