Refactoring some variable names