Revert "Tiny refactor"

This reverts commit 0f62cd6d3b86f3d6ee298b1cea315b3ae2d96a0f.