Revert "minor refactoring"

This reverts commit f2a74b87a0a9240739f9562d2624ab31bd118ac0.