Refactored and renamed vars