refractoring last updates