Minor cleanup - should behave the same, but just cleanup the variable names to avoid confusion