Clean up slightly