- reorganizing code for clarity