Make things DRYer