Wrap things in a little less silly fashion