Code style, rename variables