cleaned up parts of expr_builder; integrated it in expr.rb