Improve space around operators detection