Minor refactor
Refactoring
Revert "Minor refactor"

This reverts commit 3799a35e02440f5d4f0a3b15a88cddaa226ed321.