Revert "Refactoring"

This reverts commit 609e1a7aefd0bc8f5afcfd76f4ef711e83e9f15b.