more DRYness