Clean up the end a bit