minor refactory