Refactor: Don't reuse the same variable name