Stylistic change: organization and cleanup