Updated all variable names, to make the code more self explanatory