Cleanup for clarity.