remove an unnecessary macro
Change a variable name to prevent confusion