fix: part 2 of lint warnings resolved for batch 7/26 #1356 : Commit to be reviewed

fix: part 2 of lint warnings resolved for batch 7/26 #1356 : Commit to be reviewed #465