Revert "Minor refactor"

This reverts commit d42aeaf5d06b5d355de2915f50eb1c4202b5c691.