Made some variable names clearer