refactor, rename variables