Refactor and remove ``redefined-variable-type`` disable 
3 files changed