Clean up a little