cleanup comments
remove unneded typecast
refactoring: rename variable
refactoring: rename variable
refactoring: rename variable
refactoring: rename variable