a little more color and DRYing