Revert "refactoring"

This reverts commit b3c917e41dadebd9cffb44cbd0022fb687099be0.