Changed some variable names for legibility