Changed some variable names to make more sense