Refactored some variable names