minor refactprings