Fix error in option type w.r.t. expression types
Some formatting changes