Refactoring.
Revert "Refactoring."

This reverts commit f3fedc031d70fe14c06a8de4a23db1cbfe9bcd4e.
Refactoring.