Rename variables to improve code clarity