fix: dead code and operator precedence bug#2

ashkanrdn wants to merge 2 commits intolatestashkanrdn/CASI2:latestfrom

fix/dead-code-and-bugsashkanrdn/CASI2:fix/dead-code-and-bugsCopy head branch name to clipboard