minor refactonigns