minor refractoring
minor refractoring