minor refacotring