Still DRYer