Revert "Refactoring"

This reverts commit ac028607bbe8c56b9897ebc8eb23ab598a9db335.