rename/refactor to avoid shadowing other vars