Refactored some variable names and methods to make them more understandable
Refactored some variable names and methods to make them more understandable