Revert "Refactoring"

This reverts commit 7e9741e927838b907fbe3cd5ca2d153fe07f1ae6.