refactoring some variable names