Revert "refactoring"

This reverts commit 3e835c016f38cac2a9b49d9b29b9c1d8fb0f09a3.