minor refact