Revert "Refactoring."

This reverts commit 43aca94d25c0847a9a8ebeb209e020091ebd40f5.