Code review: change the variables names to more explict ones