Revert "Nitpick reduce code"

This reverts commit 40f909af5efc4a8e5941da49a966fb727d5a9b57.