Shorten things up a bit