Revert "refactoring"

This reverts commit d4e298877ef44ff57f488eb6edb29569ee4e18f9.