Could you avoid to use `tap`. I believe the previous code is clear.