minor refaction