minor refacs