renamed unused variables properly