Revert "minor refactor"

This reverts commit a30f7fe95f92f38c17388ff6559caafcaf7dc5e8.