refactored some variable names