Avoid redundant variable names

- avoid redundant variable names