cleanup: Changed some variable names for readability.