Update Expression.java

solution to issue #1 and issue #2