Cleaning Expression.java