refactored : renaming var.