Improve binary expressions code