Revert "minor refactor"

This reverts commit 2330c70e4d3bdfcdbedfe66060ea21a6328f882e.