minor refacotoring