Reorganize for clarity.