refactor the naming of variables