Revert "Refactoring."

This reverts commit 91bd17ec0832177ed882fea3d3514c58c89c0ef6.