Renaming internal variables
Refactored for simplicity