Refactor - rename variables from single letter to actual names.