Clean this up a little.