Refactoring, rename variables for clearness.