minor refacts