Removed duplication in the Expectations

As discussed, removing some duplication