Updated the expression handling logic to no longer require spaces around operators & operands in expressions