Reorganize for clarity