refactored some of the variable names