Revert "Small refactoring"

This reverts commit 02a1a73adb16c95a47b43507764ed140df73481b.