minor refucktoring