cosmetic: removed a redefinition of variables and put warnings in