Refactoring.
Revert "Refactoring."

This reverts commit 2e27f8a05b27a45bbe7ac5349ba4209c4c23f9c0.
Refactoring