refactor - rename variables