Refactored variable names to follow naming guidelines