Make variable names clearer