Remove infinite loop
Refactor: Amend customer variables to improve consistency