minor refacture