Refactored the variables