Simplify reuse code, rename variables.