Updated variable names to be more clear