added andThen, removed expect and a small simplification.