some minor refatory