small refactor
Revert "small refactor"

This reverts commit 36ef178235c0e7b3785e8a8112aec90c9e8f13cd.