Revert "Refactoring"

This reverts commit 31015ad905dbde5022cb278fac5d71935a52db3d.