refractoring

more are coming