Reorganizes for readability