Revert "refactoring"

This reverts commit ac425db94e6e74d329111d9d0e2b179fa1509dd8.