DRYs-up Builder a little more