Clean up this a little.