Clean up for clarity.