Refactored to have logical variable names