Refactor some variable names