Updating based on conversations, removing unused variables.