Reorganize for readability