C0103 fixes 1

this part contains the changes on local variables