Little code refractoring.