Changed variable names to be more readable