Much more DRYness