Small refactoring

* remove one `tap`
* clarify some comments