Refine variable names
Refactoring