makr strutures: lint fixings, removal of shadowing
makr strutures: lint fixings, removal of shadowing

tomviner/pytest,pytest-dev/pytest,nicoddemus/pytest,alfredodeza/pytest,The-Compiler/pytest,The-Compiler/pytest,markshao/pytest,davidszotten/pytest,pfctdayelise/pytest,tomviner/pytest,hackebrot/pytest,nicoddemus/pytest,txomon/pytest,ddboline/pytest,Akasurde/pytest,RonnyPfannschmidt/pytest