a litle more refractoring